Merge "Add post processor" into devel/master