Feature/#532