Merge "Fix indicator crash" into devel/master